Add static main
Minor refactoring
Merge pull request #2 from neurite/master

Minor refactoring