Merge pull request #3 from stianst/master

1.0.3.Final
1.0.4.Final