Merge branch 'working'
Fix #41 and #42
Merge branch 'working'