updates to 1.0.0.20131116
Merge pull request #15 from razic/update-dev-to-1_0_0_20131116

updates to 1.0.0.20131116