#189, #222, #223, close #182
Merge pull request #226 from fgiannar/develop

#189, #222, #223, close #182