Merge pull request #9 from balticit/master

master -> stage