Reverting back changes so I can make PR against master
Merge branch 'testing' of https://github.com/wluu/LogJiraWork into testing