more fixes
version bump to 0.3.6
Merge pull request #35 from fifoco/FO-6383

more fixes