issues 662
Merge pull request #664 from ApexWire/master

closed #662