Merge pull request #22 from poupotte/master

Add stack management
2.0.5
Merge remote-tracking branch 'upstream/master'