closes #25
closes #24
remove unused line
Merge pull request #27 from tutumcloud/bug_fixing

Bug fixing