phoboslab Merge pull request #8 from abamacus/master