Merge pull request #8 from orginos/master

fixed DA loops
fixed input bug