Fix work dir
Merge branch 'master' of https://github.com/chipster/chipster.git