Commit 20122014
Merge pull request #156 from horvathpeter/master

Pull Request final