added constructors
Merge origin/master