kragniz Merge pull request #24 from aisk/master …