1.0 part 2
Merge pull request #2 from Smartik89/1.0-part-2

1.0 part 2