Merge pull request #34 from jangahroo/master

Updates from 9-1-2014
(refactor) removed build system