ibaaj Merge pull request #16 from eigan/patch-1