diff --git a/container/FixedOrderedMultimap.h b/container/FixedOrderedMultimap.h
index 82d388c9..96bc0073 100644
--- a/container/FixedOrderedMultimap.h
+++ b/container/FixedOrderedMultimap.h
@@ -159,7 +159,13 @@ public:
 	 * @param key Key to search for
 	 * @return Iterator pointing to the first entry of key
 	 */
-	Iterator find(key_t key) const;
+	Iterator find(key_t key) const{
+		ReturnValue_t result = exists(key);
+		if (result != HasReturnvaluesIF::RETURN_OK) {
+			return end();
+		}
+		return Iterator(&theMap[findFirstIndex(key)]);
+	};
 
 	/***
 	 * Finds first entry of the given key and returns a
diff --git a/container/FixedOrderedMultimap.tpp b/container/FixedOrderedMultimap.tpp
index 16a7124b..4aa85e97 100644
--- a/container/FixedOrderedMultimap.tpp
+++ b/container/FixedOrderedMultimap.tpp
@@ -3,7 +3,7 @@
 
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::insert(key_t key, T value, Iterator *storedValue) {
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::insert(key_t key, T value, Iterator *storedValue) {
 	if (_size == theMap.maxSize()) {
 		return MAP_FULL;
 	}
@@ -19,12 +19,12 @@ ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::insert(key_t key, T v
 	return HasReturnvaluesIF::RETURN_OK;
 }
 template<typename key_t, typename T, typename KEY_COMPARE>
-ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::insert(std::pair<key_t, T> pair) {
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::insert(std::pair<key_t, T> pair) {
 	return insert(pair.first, pair.second);
 }
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::exists(key_t key) const {
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::exists(key_t key) const {
 	ReturnValue_t result = KEY_DOES_NOT_EXIST;
 	if (findFirstIndex(key) < _size) {
 		result = HasReturnvaluesIF::RETURN_OK;
@@ -33,7 +33,7 @@ ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::exists(key_t key) con
 }
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(Iterator *iter) {
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(Iterator *iter) {
 	size_t i;
 	if ((i = findFirstIndex((*iter).value->first)) >= _size) {
 		return KEY_DOES_NOT_EXIST;
@@ -48,7 +48,7 @@ ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(Iterator *iter)
 }
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(key_t key) {
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(key_t key) {
 	size_t i;
 	if ((i = findFirstIndex(key)) >= _size) {
 		return KEY_DOES_NOT_EXIST;
@@ -61,16 +61,7 @@ ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::erase(key_t key) {
 }
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-FixedOrderedMultimap<key_t, T, KEY_COMPARE>::Iterator FixedOrderedMultimap<key_t, T, KEY_COMPARE>::find(key_t key) const {
-	ReturnValue_t result = exists(key);
-	if (result != HasReturnvaluesIF::RETURN_OK) {
-		return end();
-	}
-	return Iterator(&theMap[findFirstIndex(key)]);
-}
-
-template<typename key_t, typename T, typename KEY_COMPARE>
-ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::find(key_t key, T **value) const {
+inline ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::find(key_t key, T **value) const {
 	ReturnValue_t result = exists(key);
 	if (result != HasReturnvaluesIF::RETURN_OK) {
 		return result;
@@ -80,7 +71,7 @@ ReturnValue_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::find(key_t key, T **v
 }
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-size_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::findFirstIndex(key_t key, size_t startAt) const {
+inline size_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::findFirstIndex(key_t key, size_t startAt) const {
 	if (startAt >= _size) {
 		return startAt + 1;
 	}
@@ -94,7 +85,7 @@ size_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::findFirstIndex(key_t key, si
 }
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-size_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::findNicePlace(key_t key) const {
+inline size_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::findNicePlace(key_t key) const {
 	size_t i = 0;
 	for (i = 0; i < _size; ++i) {
 		if (myComp(key, theMap[i].first)) {
@@ -105,7 +96,7 @@ size_t FixedOrderedMultimap<key_t, T, KEY_COMPARE>::findNicePlace(key_t key) con
 }
 
 template<typename key_t, typename T, typename KEY_COMPARE>
-void FixedOrderedMultimap<key_t, T, KEY_COMPARE>::removeFromPosition(size_t position) {
+inline void FixedOrderedMultimap<key_t, T, KEY_COMPARE>::removeFromPosition(size_t position) {
 	if (_size <= position) {
 		return;
 	}