Merge pull request #1 from AKSpan/master

10112014
Merge pull request #2 from AKSpan/new_branch

Merge pull request #1 from AKSpan/master