Merge pull request #30 from ChinosInternationalCC/master

update
Merge pull request #31 from ChinosInternationalCC/master

update
Merge pull request #32 from ChinosInternationalCC/master

update
Merge pull request #33 from ChinosInternationalCC/master

update
Merge pull request #34 from ChinosInternationalCC/master

update
Merge pull request #35 from ChinosInternationalCC/master

update
test
Merge pull request #177 from kubamarkiewicz/master

test