Version 0.04 with various fixes, details in Changes
Merge branch 'version-0.04'
Merge pull request #4 from shardiwal/master

Various improvements