Merge pull request #171 from tzumainn/master

applied Apache License, v2.0