Close #4
Merge branch 'master' into gui