diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d2dfe76..7e664ad 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.fr3ts0n.stagefever"
-    android:versionCode="010003"
-    android:versionName="1.0.3" >
+    android:versionCode="010004"
+    android:versionName="1.0.4" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/src/com/fr3ts0n/stagefever/Song.java b/src/com/fr3ts0n/stagefever/Song.java
index 31bbd77..5e87e5a 100644
--- a/src/com/fr3ts0n/stagefever/Song.java
+++ b/src/com/fr3ts0n/stagefever/Song.java
@@ -13,6 +13,18 @@ public class Song {
     String notes = "";
     int bpm = 0;
 
+    /**
+     * CSV field ids
+     */
+    public enum FID
+    {
+        TITLE,
+        ARTIST,
+        SETTINGS,
+        BPM,
+        NOTES
+    }
+
     /**
      * construct Song from array of elements
      *
@@ -24,18 +36,18 @@ public Song(String[] elements)
     {
         try
         {
-            title = elements[0];
-            artist = elements[1];
-            settings = elements[2];
+            title = elements[FID.TITLE.ordinal()];
+            artist = elements[FID.ARTIST.ordinal()];
+            settings = elements[FID.SETTINGS.ordinal()];
             try
             {
-                bpm = Integer.valueOf(elements[3]);
+                bpm = Integer.valueOf(elements[FID.BPM.ordinal()]);
             }
             catch (NumberFormatException ex)
             {
                 bpm = 0;
             }
-            notes = elements[4];
+            notes = elements[FID.NOTES.ordinal()];
         }
         catch (Exception ex)
         {
@@ -43,22 +55,26 @@ public Song(String[] elements)
         }
     }
 
+    /**
+     * Construct song from a CSV record
+     * @param record CSV data record
+     */
     public Song(CSVRecord record)
     {
         try
         {
-            title = record.get(0);
-            artist = record.get(1);
-            settings = record.get(2);
+            title = record.get(FID.TITLE.ordinal());
+            artist = record.get(FID.ARTIST.ordinal());
+            settings = record.get(FID.SETTINGS.ordinal());
             try
             {
-                bpm = Integer.valueOf(record.get(3));
+                bpm = Integer.valueOf(record.get(FID.BPM.ordinal()));
             }
             catch (NumberFormatException ex)
             {
                 bpm = 0;
             }
-            notes = record.get(4);
+            notes = record.get(FID.NOTES.ordinal());
         }
         catch (Exception ex)
         {
diff --git a/src/com/fr3ts0n/stagefever/SongAdapter.java b/src/com/fr3ts0n/stagefever/SongAdapter.java
index a1761ba..9109ed8 100644
--- a/src/com/fr3ts0n/stagefever/SongAdapter.java
+++ b/src/com/fr3ts0n/stagefever/SongAdapter.java
@@ -12,6 +12,7 @@
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
+import org.apache.commons.csv.QuoteMode;
 
 public class SongAdapter extends ArrayAdapter<Song>
 {
@@ -39,7 +40,9 @@ public void importFromCsvFile(InputStream inStr, String fieldDelimiter)
 		try
 		{
 			rdr = new BufferedReader(new InputStreamReader(inStr));
-			for(CSVRecord record : CSVFormat.newFormat(fieldDelimiter.charAt(0)).parse(rdr))
+			for(CSVRecord record : CSVFormat.newFormat(fieldDelimiter.charAt(0))
+					                           .withQuote('"')
+					                           .withQuoteMode(QuoteMode.MINIMAL).parse(rdr))
 			{
 				add(new Song(record));
 			}