Merge pull request #13 from raphinesse/cleanup

Major code cleanup