Cleaning up, ready to release development release for 1.00 pre release 1
Changes for 1.00
Merge pull request #1 from einhverfr/master

Changes for 1.00