FX-272,FX-266,FX-271,FX-265
Merge pull request #6 from fix8/dev

FX-272,FX-266,FX-271,FX-265