Finished 1st simple version;
Merge branch 'development'