diff --git a/.gitignore b/.gitignore
index 964bc06..c808fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .build*
+.idea*
 .DS_Store
diff --git a/components/ionPopup/ionPopup.html b/components/ionPopup/ionPopup.html
index f6aeadf..7eff340 100644
--- a/components/ionPopup/ionPopup.html
+++ b/components/ionPopup/ionPopup.html
@@ -1,7 +1,7 @@
 <template name="ionPopup">
   <div class="backdrop">
     <div class="popup-container">
-      <div class="popup">
+      <div class="popup {{cssClass}}">
         {{#if hasHead}}
           <div class="popup-head">
             {{#if title}}
diff --git a/components/ionPopup/ionPopup.js b/components/ionPopup/ionPopup.js
index 6fb683f..c182b3c 100644
--- a/components/ionPopup/ionPopup.js
+++ b/components/ionPopup/ionPopup.js
@@ -25,7 +25,8 @@ IonPopup = {
       title: options.title,
       subTitle: options.subTitle,
       buttons: this.buttons,
-      template: innerTemplate
+      template: innerTemplate,
+      cssClass: options.cssClass || ''
     };
 
     this.view = Blaze.renderWithData(this.template, data, $('.ionic-body').get(0));
@@ -35,10 +36,16 @@ IonPopup = {
     $backdrop.addClass('visible active');
     var $popup = $backdrop.find('.popup-container');
     $popup.addClass('popup-showing active');
+
+    return {
+      close: function(){
+        Blaze.remove( this.view )
+      }.bind( this )
+    }
   },
 
   alert: function (options) {
-    IonPopup.show({
+    return IonPopup.show({
       title: options.title,
       subTitle: options.subTitle,
       template: options.template,
@@ -57,7 +64,7 @@ IonPopup = {
   },
 
   confirm: function (options) {
-    IonPopup.show({
+    return IonPopup.show({
       title: options.title,
       subTitle: options.subTitle,
       template: options.template,
@@ -97,7 +104,7 @@ IonPopup = {
     template += '<input type="' + options.inputType + '" placeholder="' +
       options.inputPlaceholder + '" name="prompt" >';
 
-    IonPopup.show({
+    return IonPopup.show({
       title: options.title,
       subTitle: options.subTitle,
       template: template,
@@ -166,7 +173,7 @@ Template.ionPopup.events({
 
   'click [data-index]': function (event, template) {
     var index = $(event.target).data('index');
-    IonPopup.buttonClicked(index, event, template);
+    IonPopup.buttonClicked.call( template.data, index, event, template);
   }
 
 });