Merge pull request #166 from akuskis/master

Get changes from akuskis and dalerank
Merge remote branch 'gecube/master'