#2 Merging development changes into master