Updated to 1.0-final
Merge pull request #1 from stianst/master

Updated to 1.0-final