added time option, changed some formatting, debugging
Merge pull request #4 from jkrauska/master

Please pull code?