ticket # 204
ticket # 188
Merge pull request #209 from nikosphillips/master

Tickets #188 & #204