Merge pull request #28 from mtrubs/master

0.3
Merge remote-tracking branch 'upstream/master'