Merge pull request #1 from AKSpan/master

10112014