bug fixes
Merge branch 'working'