Refactoring
Merge pull request #4 from neurite/master

Refactoring