Merge pull request #6 from RWOverdijk/master

cleanup and finish