Feature/iss1

Pull request of feature/iss1 closes #1