Merge pull request #3 from sebkopf/master

clean-up / isotopia incorporation
Merge pull request #4 from sebkopf/dev

Merge pull request #3 from sebkopf/master