Removed extraneous files from directory prior to merge with kiwwa/master and pull request to bjpop/master