Merge pull request #7 from elextro/master

Sync branches
Merge pull request #8 from elextro/stable/icehouse

Merge pull request #7 from elextro/master