Develop

Pull Request for issue #35 & #36