v1.0.3
new iteration
merged changes from master