Merge tag '1.0' into develop

1.0.0
Merge tag '1.0.1' into develop

1.0.1
Whitespace issue

Somehow managed to not put a blank line between python magic line and code.