fixed some exceptions
pulled and merged with remote
Merge branch 'master' into dev
added conditions to prevent null exceptions. treated
position_relational.
update version