Changed method signatures and added return statements
merging master