Merge pull request #1 from isery/master

init
sync with boilerplate