start work on dev. mode
Merge pull request #57 from yetanotherhacker/devmode

start work on dev. mode