Merge pull request #77 from baasbox/master

update from origin master
enhancement for issue #469
Merge pull request #577 from giastfader/master

enhancement for issue #469