split src and lib (issue #6)
Merge branch 'master' into gh-pages
build 20130818-12h13