Alex Commit #1
Merge pull request #3 from bittion/feature/iss1

Alex Commit #1
solved issue #2 before conflict solved