FM-2113 Prep for bug release 1.0.4
Merge pull request #47 from cyberious/ReleasePrep

FM-2113 Prep for bug release 1.0.4