Working on #12
Merge branch 'master' of https://github.com/etcgroup/triage
Fixed #12