Merge pull request #14 from adboomgrp/master

Alex Pull Request 8/12/13