Merge pull request #55 from ProPercivalalb/master

Gimme updates!
Bamboo finished
Merge pull request #115 from chylex/master

Bamboo finished