Added Timestamp
Merge branch 'master' of github.com:jabox/jabox
cleanup headers