Merge pull request #15 from lienma/dev

Pull from dev branch