cleanup and added 14
Merge pull request #5 from meetor/master

cleanup and added 14