Sawmill and carpentry by patch 18.08.2014 (Fixes #22)
Merge branch 'master' into stuff