Updated
Merge branch 'pull_brykmoore_20141006162505746'