Dev 1.0

dev 1.0 pull request