Ticket # 202
Merge pull request #213 from nikosphillips/master

Ticket # 202