implementation improved a bit
Merge pull request #66 from xando/master

Green Team: implementation improved a bit